From: Rafał Miłecki <rafal@milecki.pl>
Date: Mon, 31 May 2021 06:35:09 +0000 (+0200)
Subject: luci-mod-network: migrate macaddr during bridge migration
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=b8607049360cad7b317f4c3b4106d2122250ea29;p=project%2Fluci.git

luci-mod-network: migrate macaddr during bridge migration

Link: https://forum.openwrt.org/t/network-migration-21-02-0-rc2/97934
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 49be69316bfea092e90c2f5a821ded961069f518)
---

diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
index 5626a2b823..64aa96090c 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/interfaces.js
@@ -326,12 +326,14 @@ return view.extend({
 			tasks.push(uci.callAdd('network', 'device', null, {
 				'name': device_name,
 				'type': 'bridge',
-				'ports': L.toArray(ns.ifname)
+				'ports': L.toArray(ns.ifname),
+				'macaddr': ns.macaddr
 			}));
 
 			tasks.push(uci.callSet('network', ns['.name'], {
 				'type': '',
 				'ifname': '',
+				'macaddr': '',
 				'device': device_name
 			}));
 		});